cssprovider: Use g_file_load_bytes()

This way, we get a special no-copy case for resources.

https://bugzilla.gnome.org/show_bug.cgi?id=790270

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 8a9a2d59feebcd60c3abc31e0c921ac3c2c97329..d4d865b68207136ad85517d05a49d0acd10ccd06 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1386,17 +1386,17 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
                                 const char     *text)
 {
   GtkCssScanner *scanner;
-  char *free_data = NULL;
+  GBytes *bytes;
 
   if (text == NULL)
     {
       GError *load_error = NULL;
 
-      if (g_file_load_contents (file, NULL,
-                                &free_data, NULL,
-                                NULL, &load_error))
+      bytes = g_file_load_bytes (file, NULL, NULL, &load_error);
+
+      if (bytes)
         {
-          text = free_data;
+          text = g_bytes_get_data (bytes, NULL);
         }
       else
         {
@@ -1428,6 +1428,10 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
             }
         }
     }
+  else
+    {
+      bytes = NULL;
+    }
 
   if (text)
     {
@@ -1445,7 +1449,8 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
         gtk_css_provider_postprocess (css_provider);
     }
 
-  g_free (free_data);
+  if (bytes)
+    g_bytes_unref (bytes);
 }
 
 /**